fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-03-13 17:04:36 -04:00
parent 6304295356 adbbbb0296
commit 17a8830592
4 changed files with 3 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/framework/Maveriks/Util/ClassLoader.php
View File

@@ -1,111 +0,0 @@
<?php
namespace ProcessMaker\Core;
class ClassLoader
{
private static $includePath;
protected static $instance;
/**
* Creates a new <tt>SplClassLoader</tt> that loads classes of the
* specified namespace.
*
* @param string $ns The namespace to use.
*/
public function __construct()
{
defined("DS") || define("DS", DIRECTORY_SEPARATOR);
defined("NS") || define("NS", "\\");
spl_autoload_register(array($this, 'loadClass'));
}
/**
* @return \ProcessMaker\Core\ClassLoader
*/
public static function getInstance()
{
if (is_null(self::$instance)) {
self::$instance = new self();
}
return self::$instance;
}
/**
* Gets the base include path for all class files in the namespace of this class loader.
*
* @return string $includePath
*/
public function getIncludePaths()
{
return self::$includePath;
}
/**
* Uninstalls this class loader from the SPL autoloader stack.
*/
public function unregister()
{
spl_autoload_unregister(array($this, 'loadClass'));
}
public function add($namespace, $sourceDir)
{
if (empty($namespace)) {
self::$includePath[] = $sourceDir . (substr($sourceDir, -1) == DS ? "" : DS);
} else {
self::$includePath[$namespace] = $sourceDir . (substr($sourceDir, -1) == DS ? "" : DS);
}
}
function loadClass($className)
{
var_dump(self::$includePath); die;
$className = ltrim($className, NS);
foreach (self::$includePath as $path) {
if ($lastPos = strrpos($className, NS)) {
$namespace = substr($className, 0, $lastPos);
var_dump($namespace);
$className = substr($className, $lastPos + 1);
$subpath = str_replace(NS, DS, $namespace) . DS;
}
$filename = $path . $subpath . $className . ".php";
var_dump($filename);
if (file_exists($filename)) {
require $filename . ".php";
return true;
}
}
return false;
}
/**
* Loads the given class or interface.
*
* @param string $className The name of the class to load.
* @return void
*/
public function loadClass2($className)
{
if (null === $this->_namespace || $this->_namespace.$this->_namespaceSeparator === substr($className, 0, strlen($this->_namespace.$this->_namespaceSeparator))) {
$fileName = '';
$namespace = '';
if (false !== ($lastNsPos = strripos($className, $this->_namespaceSeparator))) {
$namespace = substr($className, 0, $lastNsPos);
$className = substr($className, $lastNsPos + 1);
$fileName = str_replace($this->_namespaceSeparator, DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
}
$fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . $this->_fileExtension;
require ($this->_includePath !== null ? $this->_includePath . DIRECTORY_SEPARATOR : '') . $fileName;
}
}
}

73
src/framework/Maveriks/Util/Logger.php
View File

@@ -1,73 +0,0 @@
<?php
namespace ProcessMaker\Util;
/**
* Singleton Class Logger
*
* This Utility is useful to log local messages
* @package ProcessMaker\Util
* @author Erik Amaru Ortiz <aortiz.erik@gmail.com, erik@colosa.com>
*/
class Logger
{
private static $instance;
private $logFile;
private $fp;
protected function __construct()
{
$this->logFile = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . 'processmaker.log';
if (! file_exists($this->logFile)) {
if (! touch($this->logFile)) {
error_log("ProcessMaker Log file can't be created!");
}
chmod($this->logFile, 0777);
}
$this->fp = fopen($this->logFile, "a+");
}
public static function getInstance()
{
if (is_null(self::$instance)) {
self::$instance = new Logger();
}
return self::$instance;
}
public function setLogLine()
{
$args = func_get_args();
$this->setLog(date('Y-m-d H:i:s') . " ");
foreach ($args as $str) {
$this->setLog((is_string($str) ? $str : var_export($str, true)) . PHP_EOL);
}
}
public function setLogInline()
{
$args = func_get_args();
$this->setLog(date('Y-m-d H:i:s') . " ");
foreach ($args as $str) {
$this->setLog((is_string($str) ? $str : var_export($str, true)) . " ");
}
}
public function setLog($str)
{
fwrite($this->fp, $str);
}
public static function log()
{
$me = Logger::getInstance();
$args = func_get_args();
call_user_func_array(array($me, 'setLogLine'), $args);
}
}

359
src/framework/Maveriks/WebApplication.php
View File

File diff suppressed because it is too large Load Diff

6
update
View File

@@ -2,20 +2,20 @@
echo "<h1>Michelangelo Update</h1><h2>Changelog Processmaker</h2><code>" > temp.txt
git pull
git log -n 30 --relative-date --graph --format=medium --no-merges >> temp.txt
git log -n 30 --graph --format=medium --no-merges >> temp.txt
cd vendor/colosa/pmUI
echo "</code><br><h2>Changelog pmUI</h2><br><code>" >> ../../../temp.txt
git pull
git log -n 30 --relative-date --graph --format=medium --no-merges >> ../../../temp.txt
git log -n 30 --graph --format=medium --no-merges >> ../../../temp.txt
rake css
cd ../MichelangeloFE
echo "</code><br><h2>Changelog MichelangeloFE</h2><br><code>" >> ../../../temp.txt
git pull
git log -n 30 --relative-date --graph --format=medium --no-merges >> ../../../temp.txt
git log -n 30 --graph --format=medium --no-merges >> ../../../temp.txt
rake compass